Autogenerated HTML docs for v2.37.2-382-g795ea
diff --git a/git-revert.html b/git-revert.html index 5dff636..caa722d 100644 --- a/git-revert.html +++ b/git-revert.html
@@ -926,8 +926,13 @@ </dt> <dd> <p> - Allow the rerere mechanism to update the index with the - result of auto-conflict resolution if possible. + After the rerere mechanism reuses a recorded resolution on + the current conflict to update the files in the working + tree, allow it to also update the index with the result of + resolution. <code>--no-rerere-autoupdate</code> is a good way to + double-check what <code>rerere</code> did and catch potential + mismerges, before committing the result to the index with a + separate <code>git add</code>. </p> </dd> <dt class="hdlist1"> @@ -1035,7 +1040,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2022-06-17 10:57:33 PDT + 2022-08-18 14:11:07 PDT </div> </div> </body>
